Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:40:56 +0000 (12:40 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:40:56 +0000 (12:40 -0400)

Trivial merge